bitkeeper revision 1.1026.1.5 (40e18059BIr0LJ7EXKzYZYTXl3XGNA)

Fix misplaced exit in vifctl.

diff --git a/BitKeeper/etc/ignore b/BitKeeper/etc/ignore
index 0d23e1bd2dca03f172f89ca3f4e19c12ab6e7f6b..6f52b7f4ec8604216e8fd9bb601f8163af73ee71 100644 (file)
--- a/BitKeeper/etc/ignore
+++ b/BitKeeper/etc/ignore
@@ -52,3 +52,4 @@ xen/tools/figlet/figlet
 xen/xen
 xen/xen-syms
 xen/xen.*
+tools/xc/lib/.xc_rrobin.o.d

diff --git a/tools/xen/lib/util/Brctl.py b/tools/xen/lib/util/Brctl.py
index 32dd16bf81ed59a261441a16db12f4b2eb2c3197..9d3eba1e5fa43b7b5d8350d70a9895068835eaf3 100644 (file)
--- a/tools/xen/lib/util/Brctl.py
+++ b/tools/xen/lib/util/Brctl.py
@@ -33,7 +33,6 @@ def vif_bridge_add(params):
     """Add the network interface for vif on dom to a bridge.
     """
     cmd(CMD_BRCTL, 'addif %(bridge)s %(vif)s' % params)
-    return bridge
 
 def vif_bridge_rem(params):
     """Remove the network interface for vif on dom from a bridge.
@@ -122,11 +121,11 @@ def reconfigure(interface, bridge):
     global opts
     intf_info = ifconfig(interface)
     if not intf_info:
-        print 'Interface not found:', interface
+        print >>sys.stderr, 'Interface not found:', interface
         return
     #bridge_info = ifconfig(bridge)
     #if not bridge_info:
-    #    print 'Bridge not found:', bridge
+    #    print >>sys.stderr, 'Bridge not found:', bridge
     #    return
     route_info = routes()
     intf_info['bridge'] = bridge
@@ -137,7 +136,7 @@ def reconfigure(interface, bridge):
             r['interface'] == interface):
             intf_info['gateway'] = r['gateway']
     if not intf_info['gateway']:
-        print 'Gateway not found: ', interface
+        print >>sys.stderr, 'Gateway not found: ', interface
         return
     cmd(CMD_IFCONFIG,
         '%(bridge)s %(address)s netmask %(mask)s broadcast %(broadcast)s up'

diff --git a/tools/xen/vifctl b/tools/xen/vifctl
index 095dc987f4a6101edfa82cf2354549a0ae8aebd2..efd0b0b063ec253880d9e6c9bf1de1ea36bfc696 100644 (file)
--- a/tools/xen/vifctl
+++ b/tools/xen/vifctl
@@ -40,6 +40,7 @@ class VifControl:
         self.name = 'vifctl'
     
     def main(self, args):
+        #print self.name, args
         if len(args) < 2:
             usage(args)
         self.name = args[0]
@@ -85,7 +86,7 @@ class VifControl:
         for x in req:
             if not d[x]:
                 print >>sys.stderr, 'Missing parameter:', x
-            sys.exit(1)
+                sys.exit(1)
         return d
             
     def vifctl_help(self, args):